From 356e9a4bca36fea722ba7410dc43ffc80b9050f0 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Sat, 17 Apr 2010 16:36:48 +0000 Subject: [PATCH] re: r65152 fix translatewiki problems * Recover lost $permErrorsUpload in uploadBase::verifyPermissions * Use Http::isValidURI() to replace UploadFromUrl::isvalidurl() --- includes/upload/UploadBase.php | 1 + includes/upload/UploadFromUrl.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php index ea40288835..bf88de513a 100644 --- a/includes/upload/UploadBase.php +++ b/includes/upload/UploadBase.php @@ -385,6 +385,7 @@ abstract class UploadBase { return true; } $permErrors = $nt->getUserPermissionsErrors( 'edit', $user ); + $permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $user ); $permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $user ) ); if( $permErrors || $permErrorsUpload || $permErrorsCreate ) { $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) ); diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php index a904cf2fa5..8f851b06f2 100644 --- a/includes/upload/UploadFromUrl.php +++ b/includes/upload/UploadFromUrl.php @@ -104,7 +104,7 @@ class UploadFromUrl extends UploadBase { if( !$request->getVal( 'wpUploadFileURL' ) ) return false; // check that is a valid url: - return self::isValidUrl( $request->getVal( 'wpUploadFileURL' ) ); + return Http::isValidURI( $request->getVal( 'wpUploadFileURL' ) ); } private function saveTempFile( $req ) { -- 2.20.1